Merge branch 'master' into atoi

diff --cc cet_util.h
index 623084589bd8ef0c295b466fd1639049d59f9ee5,40810cd1ce43afabaf21b1200671c371aa490d0c..d864e4f64ea23803f508ac4d8a76ef89a7d8ba69
--- 1/cet_util.h
--- 2/cet_util.h
+++ b/cet_util.h
@@@ -61,8 -63,10 +61,8 @@@ const char* cet_convert_string(const QS
  
  /* gpsbabel extensions */
  
- void cet_convert_init(const QString& cs_name, const int force);
+ void cet_convert_init(const QString& cs_name, int force);
  void cet_convert_strings(const cet_cs_vec_t* source, const cet_cs_vec_t* target, const char* format);
- void cet_convert_deinit(void);
+ void cet_convert_deinit();
  
 -void cet_disp_character_set_names(FILE* fout);
 -
  #endif  // CET_UTIL_H_INCLUDED_

diff --cc compegps.cc
Simple merge

diff --cc defs.h
Simple merge

diff --cc easygps.cc
Simple merge

diff --cc stmsdf.cc
Simple merge